Only pop the tooltip down on a select set of events, not on any unknown

Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
        pop the tooltip down on a select set of events, not
        on any unknown event. (#71157, Jody Goldberg)

        * gtk/gtktooltips.c (gtk_tooltips_event_handler):
        Fix some warnings.

diff --git a/ChangeLog b/ChangeLog
index 7208a29182372693d6ab4b6148f289fe008ede82..19125dda71c696066ccc2bb141ac1ad050be9df1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
+       pop the tooltip down on a select set of events, not
+       on any unknown event. (#71157, Jody Goldberg)
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler):
+       Fix some warnings.
+
 Thu Feb 14 00:02:21 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_size_request): A bunch of

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 7208a29182372693d6ab4b6148f289fe008ede82..19125dda71c696066ccc2bb141ac1ad050be9df1 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
+       pop the tooltip down on a select set of events, not
+       on any unknown event. (#71157, Jody Goldberg)
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler):
+       Fix some warnings.
+
 Thu Feb 14 00:02:21 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_size_request): A bunch of

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7208a29182372693d6ab4b6148f289fe008ede82..19125dda71c696066ccc2bb141ac1ad050be9df1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
+       pop the tooltip down on a select set of events, not
+       on any unknown event. (#71157, Jody Goldberg)
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler):
+       Fix some warnings.
+
 Thu Feb 14 00:02:21 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_size_request): A bunch of

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7208a29182372693d6ab4b6148f289fe008ede82..19125dda71c696066ccc2bb141ac1ad050be9df1 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
+       pop the tooltip down on a select set of events, not
+       on any unknown event. (#71157, Jody Goldberg)
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler):
+       Fix some warnings.
+
 Thu Feb 14 00:02:21 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_size_request): A bunch of

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7208a29182372693d6ab4b6148f289fe008ede82..19125dda71c696066ccc2bb141ac1ad050be9df1 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
+       pop the tooltip down on a select set of events, not
+       on any unknown event. (#71157, Jody Goldberg)
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler):
+       Fix some warnings.
+
 Thu Feb 14 00:02:21 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_size_request): A bunch of

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7208a29182372693d6ab4b6148f289fe008ede82..19125dda71c696066ccc2bb141ac1ad050be9df1 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
+       pop the tooltip down on a select set of events, not
+       on any unknown event. (#71157, Jody Goldberg)
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler):
+       Fix some warnings.
+
 Thu Feb 14 00:02:21 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_size_request): A bunch of

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7208a29182372693d6ab4b6148f289fe008ede82..19125dda71c696066ccc2bb141ac1ad050be9df1 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Thu Feb 14 00:10:09 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler): Only
+       pop the tooltip down on a select set of events, not
+       on any unknown event. (#71157, Jody Goldberg)
+
+       * gtk/gtktooltips.c (gtk_tooltips_event_handler):
+       Fix some warnings.
+
 Thu Feb 14 00:02:21 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkcalendar.c (gtk_calendar_size_request): A bunch of

diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index 04a46d06649e01bf0448565e583dc1297c336f7d..359aae9df83de4b05be2c4a224324edf8d12a77e 100644 (file)
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -523,7 +523,7 @@ gtk_tooltips_event_handler (GtkWidget *widget,
 
   if ((event->type == GDK_LEAVE_NOTIFY || event->type == GDK_ENTER_NOTIFY) &&
       event->crossing.detail == GDK_NOTIFY_INFERIOR)
-    return FALSE;
+    return;
 
   old_tips_data = gtk_tooltips_data_get (widget);
   tooltips = old_tips_data->tooltips;
@@ -544,9 +544,12 @@ gtk_tooltips_event_handler (GtkWidget *widget,
     }
   else
     {
-      event_widget = gtk_get_event_widget (event);
-      if (event_widget != widget)
-       return FALSE;
+      if (event->type != GDK_KEY_PRESS && event->type != GDK_KEY_RELEASE)
+       {
+         event_widget = gtk_get_event_widget (event);
+         if (event_widget != widget)
+           return;
+       }
   
       switch (event->type)
        {
@@ -585,14 +588,19 @@ gtk_tooltips_event_handler (GtkWidget *widget,
            tooltips->use_sticky_delay = use_sticky_delay;
          }
          break;
-         
-       default:
+
+       case GDK_BUTTON_PRESS:
+       case GDK_BUTTON_RELEASE:
+       case GDK_KEY_PRESS:
+       case GDK_KEY_RELEASE:
+       case GDK_PROXIMITY_IN:
+       case GDK_SCROLL:
          gtk_tooltips_set_active_widget (tooltips, NULL);
          break;
+       default:
+         break;
        }
     }
-
-  return FALSE;
 }
 
 static void